conflict management books

Conflict management [Case Study] Written by Allen Lee Case: Yitong Network Yitong network is a Sino-Japanese Joint Venture specialized in communication product production and computer network services. Since its establishment in July 1991, the company has developed rapidly, with annual sales increasing by more than 50%. At the same time, there are many internal conflicts in the company, which affect the c

Article Source: Managers seeWe often say that a business without management is like a disunity. In such enterprises, the lack of good leadership management core, lack of good management mechanism, employees do not know how to better serve the enterprise, but also do not know how to heart to a place to think, the strength of a place. Just imagine, such a team, how

Git Branch Management and conflict resolution original: Http://www.cnblogs.com/mengdd/p/3585038.htmlCreate a branchGit branchThere are no parameters to display all local branch names in the local repository.The current checkout branch is preceded by an asterisk.Git branch newnameCreates a new branch on the currently checked out branch, named NewName.git checkout newnameCheck out the branch, that is, switch

The company intranet is composed of more than 9306 ring transmission network, in recent days to add a new node, the device joined the ring network found in the Management VLAN 99 10.9.9.12 and 10.9.9.76 (new node) in the management of the device often dropped, very unstable, through the troubleshooting found only management VLAN 99 existence of this phenomenon ot

or abandoned, and so on.　　Note : A labeled Branch, when git deletes the branch, all the historical traces from the beginning of the version tree to the tag are preserved, and the delete branch operation simply removes the name of the branch itself, so it is not necessary to save the branch for a long period of time.In other versions of the control tool, deleting a branch usually means deleting all the historical traces on the branch, so it is not considered necessary to save it because it is la

removes the name of the branch itself, so it is not necessary to save the branch for a long period of time.In other versions of the control tool, deleting a branch usually means deleting all the historical traces on the branch, so it is not considered necessary to save it because it is labeled.Delete a branch Dev2:　　be strongly deleted.Branch RenameTo rename a branch:　　git branch–m oldname newname　　- m does not overwrite the existing branch name, meaning that if a branch named NewName already e

the file after the modification, B first committed, a submitted error, a should be how to deal with it? ( This error will occur after the submitted user)Error: three extra filesExplanation of the extra three files (from top down):The first one:The second: (I (A) want to submit the code) The third one:Fourth one:Workaround:According to the above three versions of the code, a should know how to modify the code to commit, first restore to the current server in the latest version of the code fil

I spent an afternoon in the bookstore yesterday and found some books on software engineering project management. It was found that some school professors had written books on paper and could not find practical books. These are all illusory theories that may not be used in actual projects. Maybe they don't even bother r

CVS parallel version management. Beginner. 2-conflict and merge After installing CVS (refer to CVS parallel version management. Beginner. 1-install and set up), familiarize yourself with the basic concepts of CVS. Now, assume that the CVS server has a file named test. C and the version is 1.1. Code highlighting produced by Actipro CodeHighlighter (freeware)http:/

It is believed that most home users will prefer to use the Windows XP operating system, but the Windows 2000 operating system can still be seen in many office-used computers. In the recent network management maintenance, the author after a long time careful comparison and pondering, found in the Windows 2000 system for network card device replacement operation and Windows XP system has not exactly the same place, this article will be the author in thi

Recently, users git found that it is really good to use, recently done some finishing summary, found some very good information, collected here, for forgetting.Git getting started is quite simple, before some of the article, about git, but are some blunt operation, and did not systematically learn and use it. Some recent experience tells me, do not fear new things, as long as adhere to learn and tolerant of it, and constantly break through the difficulties and focus, with the accumulation of tim

I am in general years. A very serious book written by Sloan is written by science students. This is different from the general book, because the middle is filled with detailed data and evidence, and the cause and effect are very clear. Absolutely recommended. Although the pursuit of excellence can be said that many examples of the company has become a joke. Many of the ideas in the book are impressive. Locate a book about marketing that gives you new ideas. It is worth looking. Competitive A